Skip to content

Trap Stash App + 7 New Icons + OSShell Emoji Purge - #95

Merged
BrandDead merged 1 commit into
main-tL2525from
feat/trap-app-icon-deemoji
Aug 5, 2026
Merged

Trap Stash App + 7 New Icons + OSShell Emoji Purge#95
BrandDead merged 1 commit into
main-tL2525from
feat/trap-app-icon-deemoji

Conversation

@BrandDead

Copy link
Copy Markdown
Owner

What's in this PR

Trap App (new)

The Trap is the player's off-block stash — the single place all items live until given to a member. Accessible from the home dock.

  • Category tabs: ALL / WEAPONS / ARMOR / VEHICLES / PRODUCT / TOOLS / CONSUMABLES
  • Item gifting: tap an item, tap a crew member, set quantity → GIVE. Once given, it belongs to them permanently
  • Member stash viewer: tap any active member to see what they're carrying
  • Backdoor mechanic: remove a member from the gang, reclaim all their items, morale drops, contact marked backdoored. Irreversible confirm modal.
  • Wired into App.tsx lazy route trap and OSShell dock

7 New App Icons

All 512×512 cinematic dark style matching existing icon set:

  • TRAP — stash room with cash bricks, gold chain, glock
  • CONTACTS — burner flip phone, contact list, city skyline
  • BIP N DIP — hooded figure breaking into a car at night
  • ATTACK — top-down city block with red crosshair, four shooters
  • OPS PLAN — tactical map table, gloved hand pointing, red X marks
  • RAID — police battering ram breach, crew jumping out window
  • RANKINGS — graffiti wall leaderboard with crown and city skyline

OSShell Emoji Purge

  • All icon fields now use text fallbacks (never rendered as emoji in UI)
  • Lock overlay: 🔒LOCKED
  • Notification bell: 🔔 → CSS text
  • Raid probability: 🚨 → text label
  • Dock: all 4 items now use GameSprite icons (dealt/slide/crew/trap)
  • Every one of the 22 apps now has a spriteIcon set

Tests

430 passing (22 test files)

TRAP APP (components/trap/TrapApp.tsx + TrapApp.css)
- New stash manager: all items earned/bought/crafted live here
- Category tabs: ALL / WEAPONS / ARMOR / VEHICLES / PRODUCT / TOOLS / CONSUMABLES
- Item-to-member gifting: tap item, tap member, set quantity, GIVE
- Once given, item belongs to member permanently (per design spec)
- Member stash viewer: see what each active member is carrying
- Backdoor mechanic: remove member from gang, reclaim all their items,
  morale drops, contact card marked backdoored
- Backdoor confirm modal with irreversible warning
- Wired into App.tsx (lazy route 'trap') and OSShell dock (replaces shoebox)

NEW APP ICONS (public/assets/icons/)
- icon_trap_new.png     — stash room, cash bundles, gold chain, glock
- icon_contacts_new.png — burner flip phone, contact list, city skyline
- icon_bipndip_new.png  — hooded figure breaking into car at night
- icon_attack_new.png   — top-down city block with red crosshair, shooters
- icon_planner_new.png  — tactical map table, gloved hand, red X marks
- icon_raid_new.png     — police breach door, crew escaping window
- icon_leaderboard_new.png — graffiti wall rankings with crown

GAMESPRITE (components/common/GameSprite.tsx)
- APP_ICONS updated: leaderboard, trap, contacts, bipndip, attack, planner, raid
- All new icons wired to proper paths

OSSHELL (components/layout/OSShell.tsx)
- Full emoji purge: all icon fields now use text fallbacks (never rendered as emoji)
- lock-overlay changed from emoji to text 'LOCKED'
- notification bell changed from emoji to CSS text
- raid-probability changed from emoji to text label
- dock updated: shoebox replaced by trap, all dock items use GameSprite icons
- Trap app added to app grid (gold, between shoebox and market)
- Contacts app added with dedicated icon
- Raid app added to grid with dedicated icon
- All 22 apps have spriteIcon set (no more emoji-only apps)

TESTS: 430 passing (22 test files)
@vercel

vercel Bot commented Aug 5, 2026

Copy link
Copy Markdown

The latest updates on your projects. Learn more about Vercel for GitHub.

Project Deployment Actions Updated (UTC)
slide Ready Ready Preview Aug 5, 2026 7:10pm

@cursor

cursor Bot commented Aug 5, 2026

Copy link
Copy Markdown

Bugbot is not enabled for your account, so this pull request was not reviewed.

Enable Bugbot in the Cursor dashboard to get automatic reviews on future PRs.

@BrandDead
BrandDead merged commit 4400701 into main-tL2525 Aug 5, 2026
3 of 5 checks passed
@BrandDead
BrandDead deleted the feat/trap-app-icon-deemoji branch August 5, 2026 19:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant